lisp/ChangeLog: Remove merge marker.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 735b1c56c31d4afd379b49926355ed5f8820132b..233a72e79df119796c14e9f25d2ad9aa953b5320 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -131,7 +131,6 @@
        * subr.el (with-silent-modifications): Don't bind deactivate-mark,
        buffer-file-name, and buffer-file-truename any more.
 
->>>>>>> MERGE-SOURCE
 2014-04-08  Leo Liu  <sdl.web@gmail.com>
 
        Use lexical-binding and require cl-lib.